Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 20:35:00 +0000 (13:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 20:35:00 +0000 (13:35 -0700)
commitca897a2a5a6e40ddf200e14ebff2bc7ed4289422
tree6ba60896bf5691233c8aff4dbe5090559c24de71
parent7f6058d7dcd8d198f68a6a81c5ed2908af4b8cfd
parentc52ec447355c68e063b335fa559935046086e763
Merge from trunk.